Major update: v0.2

Still working