Merge pull request #375 from gtalusan/master