Merge pull request #349 from ibobalo/master