Applying changes according to discussions of Issue #99