Merge pull request #376 from gtalusan/master