Merge pull request #340 from gm4tr1x/master