Initial commit on branch feature1.
Merge pull request #1 from nweiler/feature1

Initial commit on branch feature1.