Fix #18
Fix #15