added some more.
Merge branch 'dev'