Merged pull request from NeoBlack -- 79bf10f
Signed-off-by:shawnsandy <shawnsandy04@gmail.com>
Merge pull request #4 from shawnsandy/develop

Merged pull request from NeoBlack -- 79bf10f