More update
Update rakefile
Submodule tracking master