Lots of changes, v 0.1.2