ruby 2.0 fixes
Merge pull request #1 from raffapen/master

ruby 2.0 fixes