Feature/fix 22

Fixes #22 
close #22