Fix #17
Fix #18