initial version
Merge branch 'master' of https://github.com/jancura/modular-server