Fixes #26
Fixes #25 #22