Merge pull request #8 from MarcusTomlinson/master