merged Rakefile from master into "onlygrammar"