Merge pull request #85 from sourishkrout/master

Make flick work reliably
Refactored element look up.