VERSION 0.2

Lots of changes