Updated references
Updated references again
Updated rakefile