Merge pull request #17 from Jtfinlay/master

Updated UML some more.
Added views