continue view work
Merge pull request #1 from zyzo/develop

continue view work