Merge pull request #11 from brentproost/master

Merge with master
snelle commit