Merge pull request #12 from thatcoderguy/master

merge changes