Merged WCF (after 2nd proj.) into master