Modernize format.
Merge pull request #1 from olab-io/master

Modernize format, fix bugs.