firstish draft
Merge branch 'master' of https://github.com/spall/advalg
merging