Merge pull request #2 from nicklynchjonely/master

New commit