Changes as per Issue #9