Issue #24 - Merging acknowledge mode pull-request from whaley