added feature 3
added feature 2
Merge branch 'xyz-feature' of github.com:obi-a/soljartest into xyz-feature