issueID #11 minor changes