this closes #37
Merge pull request #38 from eprogramming/master

this closes #37