this closes #40
Merge pull request #44 from eprogramming/master

this closes #40