First draft
Improved outputs
Merged from default GitHub scaffold