Merge pull request #33 from Edzelopez/GEP-19

GEP-19 Notice fixes
GEP-19 Notice fixes