Merge pull request #2 from seanbuscay/develop

Develop
Merge pull request #13 from seanbuscay/master

Sync Dev to Master