Merging WebFramework into master