Issue 1227 - Conflicts Solved

Updated  @xiangyu89's PR to allow for a painless merge with the master branch.
Use the new Ruby 1.9 hash syntax.