Merge pull request #48 from dnomikos/master

updates, corrections & translation improvement
Merge pull request #49 from dnomikos/master

fix parser error
Merge remote-tracking branch 'upstream/master'