Update for name change and fix everything
Merge pull request #1 from tomaka/master

Update for name change and fix everything