issue/#33

fixes #33