Fixed warnings
Merge pull request #1 from jystic/master

Productionised