Merge pull request #72 from eprogramming/master

issue #38