Fixed not well-formed exception
More L20n
Merge pull request #48 from SunboX/master

More L20n & small bug fix