fix #14
fix #16