This closes #132
This closes #132
Merge pull request #147 from eprogramming/master

This closes #132