update to 2013 version
update to 2013 version
Merge branch 'master' into gh-pages