Merge pull request #28 from dnomikos/master

update strings
Merge pull request #29 from dnomikos/master

update strings