Dev

Master branch is way too old. Lets merge (tag 0.1.0) from dev to master.