u_wip
make tests pass
merge master, make tests pass
Merge pull request #90 from escherba/u_wip2

make tests pass