followed small edixes
followed small edixes 2.0
Merge branch 'dev'