message wording
resolved merge conflict
Merge pull request #39 from Fprince333/master

message wording
pulling from upstream