Merge pull request #25 from eprogramming/master

cleanup