the tests stopped working (maybe OS upgrade changed ruby version?), now they work again (Ruby 1.9.3)
merge master