wrap in anon function
and add some credits
Merge branch 'master' into gh-pages