Added more stuff.
Merge branch 'master' into dev3