Fix #16
Fix #15