hchargois Merge pull request #6 from usrshare/master