bugfix: crash under multi-process situation
Merge branch 'master' of github.com:nephia/Nephia