refactor. fix #10, fix#15
Merge branch 'master' of https://github.com/anrak/tp_2014_02_java_rakhubov