Dev to master

0.2 alpha