Merge pull request #2 from seanbuscay/master

Bring develop and master into sync.
Merge pull request #3 from seanbuscay/develop

Merge pull request #2 from seanbuscay/master