Reviewed pull request #8 by me!