resolve #10 and #11