Merge pull request #283 from gabri94/master