Fixed Issue #5.
Fixed Issue #6.
Merge branch 'develop'