adding some features to rakefile
Merge branch 'dev'