Fixes to work with OIPA V2.1 API
minor update
Merge branch 'master' into openaid-dev