this closes #5
Merge pull request #20 from eprogramming/master

this closes #5