Catch up to Ruby 2.0.0
Terminology library separated