updating references. Thanks Deny!
Merge branch 'master' into gh-pages