fix subtlety errors
Merge remote branch 'indz/master'