Merged Dennis and Roel`s changes as well.
issueID #11