Switch to Ruby 1.9 format
Merge branch 'develop'