Merge pull request #4 from Wikia/master

Merge master to development branch
warning-fixes
Merge pull request #6 from Wikia/feature/warning-fixes

warning-fixes