Rakefile edits and issue 3