Merge pull request #75 from eprogramming/master

issue #38