Zerotwo

Merging branch Zerotwo into master. Ready to release 0.2.0.