Code cleanup and release 0.1.1 on Bintray