master

Solve var problem and test