modification in order to work with ruby-1.9.3
Version info modified
fixing gem version
fixing conflicts