Merge pull request #15 from bnucmb/dev

Merge pull request #14 from bnucmb/prod