pull request 16 from albert-wang