NEW: StratusLab code up to the repo ( UNTESTED ! )
Merge pull request #64 from ubeda/StratusLab

NEW: StratusLab code up to the repo ( UNTESTED ! )