Clean up code and fix multiple instances problem
Bump to v0.3