Merge pull request #213 from dlobo/NoticeFixes