Merge pull request #1 from gextech/master

Update from original
fix performance issues
Upgrade version
fix package name
Merge pull request #10 from hgmiguel/master

Fix performance issues