ose model
Merge branch 'master' of https://github.com/AndrewMundy/notebooks