Merge pull request #70 from eprogramming/master

bug fix