Merge pull request #11 from thesleuth/7.x-2.x-dev

Addresses #19, #15, #10
updating string
merged from upstream