Merge Fixes for Issue #94

Will require a schemamigration for the new app.