[WiP] issue #614

Created PR to trigger test on Travis-CI.