Frame renovation

The merge branch for #65.