Version 0.22: refactoring

date:	2014-07-20
time:		 23:59

Changelog:
* refactored some things