Merge pull request #182 from brendangregg/master

simplify code using new features