working complete functionality
Merge pull request #42 from bumblebees-2014/view

working complete functionality