Merge pull request #16 from blairprophett/master

updated devised views to match previous work