Ruby187 compatibility

A vastly improved version...