Merge test to master

add new static main