v 0.0.11 address issus #10, #15 and #17