Merge pull request #2 from mekanix/master