Here's an indentation typo, see commit 6eb24af4578f0006dfa162dca5ee25334523f06a

This merge also fixes #5 and #6