fix
Merge branch 'dev' of github.com:singerinsky/omgserver into dev