Remaining things for pull-request 68

Sorry for the mess with all those pull-requests.

Remaining commits for PR #68: See: https://github.com/lox/pheasant/pull/68#issuecomment-29800630