finishing touches
Merge branch 'dev'