Fixes #75.
Fixes #74.
Merge pull request #76 from lucaswerkmeister/master

Fixes #75 and #74.