Merge pull request #39 from thatcoderguy/master

Merge changes