v0.6.7: merged pull request #12, #22, #23