ticket:1 tests added
ticket:1 app implemented
ticket:1 Merge branch 't1_nethen'