Finished #64
Merge branch 'master' of https://github.com/SBucur/Java-misc