Merge pull request #2 from seanbuscay/master

Bring develop and master into sync.