Content update

Merge #61 first.