Fixes 3
Merge branch 'shell' of https://github.com/mashaka/fizteh-java-2013 into shell