issue #12, #13

issue done.