Merge pull request #165 from MarcusTomlinson/master