Merge pull request #9 from fr500/master