Fix warnings
Merge pull request #50 from zalora/fix-warnings

Fix warnings