Merge pull request #1 from ecomfe/develop

Develop
Merge pull request #2 from ecomfe/develop

bump
Merge branch 'develop', release 0.1.1
Update index.tpl

disable email detection.