this closes #49
Merge pull request #72 from eprogramming/master

this closes #49