minor changes
changed package name
merged new features