In Java
Merge pull request #316 from hibazinga/patch-55

In Java