Minor fixes
Merge pull request #5 from elasticio/master

Deploying current version