Revert "Merge pull request #36 from hongquan/testing"

This reverts commit 09a746e5cfa002ee54c36cf5f8ff8c7ec33b89cf, reversing
changes made to 197ccfefbbbf5711d7129eb005e3312eecb71603.
Revert "Revert "Merge pull request #36 from hongquan/testing""

This reverts commit b20eb9a357b2fee90ee870893274a12e969b9f1f.