Fixed scoundrels/scrib #66
Merge remote-tracking branch 'origin/master'