Made the whole thing _actually_ work with Linux.
Merge pull request #2 from joezeng/master

Made the whole thing _actually_ work with Linux.