Improve rakefile, resolves #31