Issue 30

fixes #30