Merge pull request #2 from chizarlicious/master

Merge pull request #1 from chizarlicious/dev
Merge pull request #3 from chizarlicious/dev

Merge pull request #2 from chizarlicious/master