20141201 comited from work. Old version.
20141223 from work
Merge branch 'master' of github.com:andrew0snake/2