this awesome closes #6
Merge pull request #21 from eprogramming/master

this awesome closes #6