woohoo
here we go
Merge remote-tracking branch 'upstream/master'

ster'

because
Merge pull request #19 from davidkoh/master

dave