Cleanup, some fixes
Merge pull request #15 from cloudspace/cleanup

Cleanup, some fixes