fixed #13
fix #12
bug fix
fix #13