Merge Fixes for Issue #119

Besides making changes for Issue #119 also changed code to make delete functional for the inline entries.