Issue75

please merge #95 first!
fixes #75