Added short description

More information and documentation added along the way.
Merge branch 'master' into develop