added support and test for rhino too