small changes, wrong branch
issueID #11