updated UnitTests
Merge branch 'release/v1.0.5'
updated comments