cliffwoo's answer
Merge pull request #6 from cliffwoo/master

cliffwoo's answer