Merge branch 'generic-example'
Merge branch 'master' of https://github.com/raubreywhite/automatic_analysis