this closes #41
Merge pull request #54 from eprogramming/master

this closes #41