Rebuild for Issue #114 Pull #116