update strings
Merge remote-tracking branch 'upstream/master'
Merge pull request #50 from dnomikos/master

update strings