Merge pull request #10 from murrekatt/develop

Some more cleanup.