first PR #7

Merged mfwolffePro merged 1 commit into trunk from feature