Merge pull request #263 from gabri94/master