v0.9.9.7 from branches/i-cambell/ to trunk
New trunk project as a copy from Aliazzz personal Branch...