constructor
Merge branch 'exp'