Issue #19
Merge pull request #20 from eprogramming/contrib

Issue #19