This must fix problems
Merge branch 'master' of https://github.com/isItJavaOrSomething/fizteh-java-2013