Updated to 0.6.1
Tested only on MRI and JRuby