Fixes #26 and #27