included changes from https://github.com/mde/geddy/tree/minimal-app