Merge branch 'dev'
adding badges
use the global namespace
Merge pull request #1 from mcanaves/master

Use the global namespace