Minor performance improvements and bug fixes
Merge branch 'master' of https://github.com/sergey-rybalkin/emmet.net