Merge pull request #2 from seanbuscay/master

Merge pull request #1 from seanbuscay/develop
Merge pull request #3 from seanbuscay/develop

Merge pull request #2 from seanbuscay/master