Use passed view instead
Fixed framework path
Merge remote-tracking branch 'origin/master'
Fixed framework path