some improvements
Merge branch 'master' of https://github.com/remixer-dec/notifications