Some bugfixes and update to Ruby 2.0.0