PR 3 for rebase #9

Merged mfwolffePro merged 1 commit into trunk from feature-3