Merged in noryb009/hexvexed (pull request #1)
For GCI2013 task: http://www.google-melange.com/gci/task/view/google/gci2013/5778078559109120
