Features sprint13

Implemented US# 61 und US#66