issue/#25

fixes #25