Issue #130, edit documentation and implementation