Fix #23
Fix #18