Byzhang

Please ignore the cmake related changes.