added changes in dev
made some progress
Merge branch 'dev'