Merge pull request #22 from p2k/master