Merge pull request #24 from eprogramming/master

cleanup