Minor refactoring
Merge branch 'master' of http://github.com/novopl/nweb