Issue 44

fixes #44