homme Merge pull request #4 from philhug/master