Issue 31

fixes #31