unit tests pass
Merge branch 'exp'