Merge from nemith-master
Merge branch 'nemith-master'