Merge pull request #28 from viraptor/extra_strings