some refactoring and added initial scenario for SoapUI
Merge remote-tracking branch 'origin/master'