fix performance issue
Merge branch 'master' of git://github.com/keyaral/SwenProject