Bugfix & added alert
Merge pull request #4 from kwsch/master

Bugfix & added alert