this closes #43
Merge pull request #58 from eprogramming/master

this closes #43