First commit from gollum-lib