Issue 56

fixes #56
please expect new bugs and unresolved issues.