20130416_Tests-ok
130417 Updated