Some minor cleaning up.
Merge branch 'master' into issue31