Fix #15
Fix #14