Merge branch 'hotfix/1.02'
Improved documentation and some git aliases
Merge branch 'hotfix/1.03' into develop