relative to #153
Merge pull request #154 from eprogramming/master

relative to #153