Merge branch 'hotfix/1.0.4'
Merge branch 'develop'
add nitrous link
Merge branch 'hotfix/1.0.5' into develop