Merge pull request #31 from Edzelopez/GEP-19

GEP-23 Deleted extra file
GEP-19 Notice fixes