Added stuff
added title
Merge branch 'dev'