Small changes
issueID #11