this closes #45
Merge pull request #53 from eprogramming/master

this closes #45