Merge pull request #135 from gm4tr1x/master