cswam: update that compiles but is still under debugging.
Authored by: mfederico 2015-05-27
Parent: [r861]
Child: [r863]