Merge upstream changes from matyb into my repository

To address issue #1, merge changes from https://github.com/matyb/java-koans.git into my fork of the repository.