Merge pull request #8 from MikeSantiagoInc/master

Repo Sync
Merge pull request #6 from Luigifan/master

Merge pull request #8 from MikeSantiagoInc/master