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