Merge branch 'develop'
reorder rakefile
Bump version to: 0.2.26
update upgrade
Merge branch 'master' into develop