Merge branch 'master' into development
Added current functionality tests
Listed functionality test sources.
Fixed header names
Merge branch 'development'