added view support
Merge branch 'dev'