Merge branch '0.2.1'

Conflicts:
	CMakeLists.txt