Fixes merge conflicts
Merge pull request #37 from ilanasufrin/ben_branch

Fixes merge conflicts