this closes #151
Merge pull request #152 from eprogramming/master

this closes #151