Merge pull request #183 from MarcusTomlinson/master