Update Rakefile; fix #21