Merge branches 'master' and 'beta-tester'
Merge pull request #6 from coderdiaz/master

Merge branches 'master' and 'beta-tester'