Edditing a little
Merge branch 'dev'