optimization and bugfixing
Merge branch 'master' of https://github.com/powerbot15/alloy-pull-to-refresh