Issue 1227 - Conflicts Solved

Updated  @xiangyu89's PR to allow for a painless merge with the master branch.
Line is too long. [83/80]<br>Space missing after comma.<br>Space missing to the left of {.<br>Space between { and | missing.<br>Space missing inside }.