Jordan's update
Merge pull request #88 from CherryJam/patch-4

Jordan's update