Fix bugs, add a package and fix #49