v1.7a Updated

final after merge
Merge remote-tracking branch 'origin/master' into MindashqNext