Unit tests were added. Bug fixes.
Merge branch 'develop'

Merge 5.