Merge pull request #149 from eprogramming/master

this closes #144
this closes #151