Merge pull request #50 from dnomikos/master

update strings
Merge pull request #51 from dnomikos/master

updates & corrections