crohr Merge pull request #148 from monotek/master …