issue #12 & #13 fixed.