Fix nick error in nick change regex
Merge remote-tracking branch 'origin/master'