sursly Merge pull request #4 from RosaWagner/master