Feature #10

see #10