Saving before new feature.
Formatting.
Keep to simpler approach.
OSI formatting fixes; test program.
Merged from develop.
Merge branch 'feature/OSI' into develop