Feature 2 added
Merge branch 'develop' of https://github.com/mvgorp/emaho into feature2