Changes for issue #131
(cherry picked from commit bfedb50)
Replace el selectors with cached el usage
I didn't mean to duplicate issue #131 that I submitted. I apologize for any confusion or inconvenience. This issue is simply the pull request with code attached. Cheers!
I like this
fixing merge conflict with updated selectors from pull request #132