This closes #163
Merge pull request #164 from eprogramming/contrib

This closes #163