Merge pull request #144 from gm4tr1x/master