Merge pull request #371 from gtalusan/master