Merge pull request #7 from nicklynchjonely/master

update commits