multiple improvements
Merge branch 'master' of github.com:cptaffe/lang