fixed
Merge branch 'master' of https://github.com/l1fe/fizteh-java-2013