Merge pull request #2 from bnucmb/dev

Some minor changes
Merge branch 'dev' into prod
Merge pull request #3 from bnucmb/prod

Prod