In Java
Merge pull request #317 from hibazinga/patch-54

In Java