updates to 1,2,3
Merge branch 'master' of https://github.com/pzfreo/ox-soa