Merge pull request #27 from entireio/computermode-patch-1