second commit
minor #13 clean-up 2 (sstok)

This PR was merged into the master-new branch.

Discussion
----------

clean-up.

We should be able to switch the base.

2

Commits
-------

b0f669f10118fad2e4b9cb0fe82598b4cf346f55 second commit (sstok)