Fixed #17 and #18