implemented changes as they were requested in issue #34