Merge pull request #12 from thatcoderguy/master

merge changes
Merge pull request #14 from widagroup/master

Merge pull request #12 from thatcoderguy/master