bug21 - took strings and put them into respective files
Merge pull request #24 from igoryen/bug21

bug21 - took strings and put them into respective files