Merge pull request #2 from badassmofo/master

Syncing up the develop branch