Merge pull request #126 from HazyResearch/develop

Develop
bug fixing