Merge pull request #156 from gm4tr1x/master