Merge pull request #74 from eprogramming/master

bug fix