Update to clean up faulty merge artifacts. Issue #14