Fixing problems caused by rename
Merge pull request #2 from arobson/master

Fixing problems caused by rename