After Gosu related testing from work
Merge branch 'master' of https://github.com/vicky17d/JavaL