issue/#41

fixes #41