wbl Merge pull request #6 from wbl/watson/work