Added some info.
Merge branch 'master' into dev3