Merge pull request #3 from murrekatt/develop

Some cleanup