Merge pull request #2 from badassmofo/master

Syncing up the develop branch
Merge pull request #3 from badassmofo/develop

Merge pull request #2 from badassmofo/master