small refactoring
Merge branch 'master' of github.com:gabesoft/mogen