added static option
code style
Merge branch 'feature/static'