bug fix
Merge branch 'master' of https://github.com/kgeorgiy/java-intro-2014