Merge pull request #146 from gm4tr1x/master