Closes #478 (closed)
@ondrej please review the configure stuff, as I'm not sure I'm correct there.
This will create a new commit in order to revert the existing changes.
