TODO: Updated
Merge branch 'nested_views' of github.com:goliatone/gview into nested_views