Added GetViewCount
Merge origin/master