Merge branch 'master' into add-rakefile-issue1
add Rakefile closed #1
Merge branch 'add-rakefile-issue1'