Final Merge of Update 2.0

Merge Branch 2.0 into master to complete update.