Merge pull request #260 from gm4tr1x/m13100_osx