make it 1.9/2.0 compatible

probably should refactor + gemify too