Version 0.23: refactoring

date:	2014-22-07
time:	     23:30

Changelog:
* refactoring