first round
polish
Merge pull request #14 from ulberge/lang

Lang