merge Branch ISSUE_66_ATTEMPT_01 to master

Created by: thomaswoehlke