Merge pull request #76 from eprogramming/master

issue #40