remove v1 and add alerts
Merge branch 'master' into alerts

Conflicts:
	README.rst
Merge pull request #11 from venturaville/alerts

Alerts