Initial commit on branch feature3.
Merge pull request #8 from nweiler/feature3

Initial commit on branch feature3.