Revert "Merge pull request #6 from dpiao92/master"

This reverts commit e23bf669eebc697283805f652c7bf73b4c475900, reversing
changes made to 48e31ff5a6c418e1256a979627f5037cbecaa980.
Revert "Revert "Merge pull request #6 from dpiao92/master""

This reverts commit 1d975e5f6be594d9fe12492e6e9fa36e81807975.