Merge pull request #82 from eprogramming/master

bug fixed