Close #13, #15
Fix #14