fixes
some improvement
Merge commit '72affe2d17ce7bd5dc206adb09431a637dc1d180'