Merge pull request #1 from badassmofo/develop

Refactoring and code cleanup
Create README.md
Merged with 'master' branch