fixes #28, continue work on #3
weiter an #3, fixes #29