Merge pull request #154 from gm4tr1x/master