merge development into master

This commit includes mainly code documentation changes.