Merge pull request #77 from eprogramming/master

issue #42