Merge pull request #61 from timwindsor/WebWorks-2.0

Updates for WebWorks 2.0