Issue #219 - make it work a little more