updated rake task
Merge branch 'development'