gemify this library
Merge branch 'dev'