Merge pull request #293 from gmadrid/master