Wandys second commit
Merge pull request #1 from tsangsimon/simons-branch

Wandys second commit