Merge pull request #377 from gtalusan/master