Merge branch 'hotfix/1.0.5'
Changes made to reflect tests done
Added an over-looked change to match test branch
Merge branch 'hotfix/1.0.6' into develop