Bug fixes
Code review fixes
Merge pull request #7 from Wikia/fixes

Bug fixes