Merge pull request #167 from gm4tr1x/issue84