Fix #13, merge #14, #15