removed _.each methods on tick for performance boost
Merge branch 'master' into gh-pages