Fixes. Final version
Merge branch 'master' of https://github.com/DuXeN0N/formal-lang-2013