Merge branch 'katina-0.1' into katina-0.2

Conflicts:
	src/Katina.cpp