Merge pull request #6 from Crowdedlight/master

fixed string/tooltip/button text issue
Merge pull request #2 from vikinghug/development

Merge pull request #6 from Crowdedlight/master