Merge pull request #43 from silversteez/master

Better notifications!
Fixed minor bug.