Merge branch 'master' of github.com:hvdieren/swan-tutorial