[feature] OSIAM 1.2
Merge pull request #4 from tkrille/osiam-1.2

[feature] OSIAM 1.2