cleanup and bug fixed
Merge pull request #26 from eprogramming/master

cleanup and bug fixed