fit #26.

created this new branch to make the merge easier.