trying to fix long url bitly problem..
Merge branch 'master' into gh-pages