Initial commit on branch feature2.
Merge pull request #6 from nweiler/feature2

Initial commit on branch feature2.