Fix merge conflicts.
Merge pull request #10 from zestyping/fix-merge

Fix merge conflicts.