Removed <nomodeline>
Merge branch 'refactoring'