Fixed support for mri-1.8.7
Bump version to 2.1.1
Merge branch 'develop'