Switched to 0.8.2-SNAPSHOT since 0.8.1 is already released!
Cleaned up a little bit more