Partly implemented issue #178
Partly implemented issue #178