Fixes #3 and #27