Merge pull request #76 from sjinks/issue-1379

Fix #1379
Fix #1379
Merge pull request #1383 from dreamsxin/view

Fix #1379