Git-Fix-Felix

Merged the codes by hand to eliminate compilation errors.