Updated according to Willem's comments
Merge pull request #54 from joe-github/master

Updated according to Willem's comments