Merge pull request #6 from domenato/testing

Merge testing to production
Merge pull request #9 from domenato/production

Merge pull request #6 from domenato/testing