ticket:1 added tests
ticket:1 added implementation
Merge branch 't1_nethen'