Updating to include alerts functionality
Merge pull request #2 from dfederico/master

Updating to include alerts functionality from Dan