Java FTW Ollie ... Please accept my pull request ;)