Fixed username issue.
Updated package.
Merge branch 'dev' of github.com:hkpeprah/marmoset into dev