bugfix and change package name