Update to v1.1
Revert package name change from previous commit
Minor code changes
Fix indentations