fix #13
Fix #14