- Manual merge with changes for better integration of Issue #4