fix #14
fix #15