fixed put key bug
Merge branch 'philipp' into testing