Incorporating changes from @beroe
Merge branch 'master' of github.com:swcarpentry/assets