fix #6 and #7

For some reason, a wrong import slipped through.
Changelog for PR #8.

#6 fixed.

#7 fixed.