Feature/#22

finished Feature/#22, ready for inspection