done: #11
done: #12
for release
Merge branch 'hotfix/nd4k-problem'