Story view

merge with master