Merge pull request #8 from jackhumbert/master