Cleanups
Unit test ...
Merge branch 'master' into take2