Merge pull request #8 from Hashcode/master

zephyr: small fixes