dpallot Merge pull request #107 from ahadley1124/master