Merge pull request #2 from acfung/master

Angus' second commit
Angus' third commit