master: Upgrade to version 0.2. Lots of changes