updated
Merge pull request #40 from JohnTroony/master

updated