updated spec and operation
Merge branch 'develop'