MarkUsProject/Markus — pull request #1506 by ealonas (2014-06-09 15:39:48+00:00)
Title: Issue 1227 - Conflicts Solved

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