Merge branch 'master' into development
updated about text
updated documentation page
Merge branch 'development'