fixes #17 and #9