Angus' third commit
Merge pull request #3 from acfung/master

Angus' third commit