Caching selectors
Code clean up
Build optimisation
Merge branch 'v2'