Merge pull request #17 from fr500/master