Modifications 131029 : Continued tests and additions
Modifications 131029 : Continued tests and additions