changes made according to comments Issue #1913