bug fixes
Merge pull request #20 from eprogramming/master

bug fixes