Fixes

Fixes minor issues
- Missing language string
- Fixed notices
- Reportrs Issues
merge
Fixes & Issues
merge changes and conflicts
Merge pull request #125 from juliopontes/staging

Fixes