Revert "Merge pull request #14 from ZhengyangL/master"

This reverts commit 2f64e92fbe8ab92178cd774a3a36fce8c5bbacce, reversing
changes made to 84c8314a5ba2df64a02f142fecda4e1a3383793b.