Fix merge issue that broke tests
Merge pull request #5 from jyang15/fix_merge

Fix merge issue that broke tests