Merge pull request #17 from thatcoderguy/master

Merge pull request #18 from widagroup/master