Issue 33

fixes #33