Merge code

Merge code from okamstudio