Merge pull request #125 from juliopontes/staging

Fixes
Fixes

Notices, Warnings