Merge pull request #233 from bjanish/sandbox

View fix