Issue 1227 - Conflicts Solved

Updated  @xiangyu89's PR to allow for a painless merge with the master branch.