removed duplicated type attribute
Merge branch 'develop'
Margind hotfix from develop back into master