Merge pull request #17 from QuigProQuo/master

@kaiprt @mendoncakr organized logic for notification controller