refactoring
Merge branch 'master' of github.com:accucode/paragon-server