Merge pull request #863 from MrPetovan/bug/notices