WIP
rebuild for Issue #121 Pull #121