Tomas devel

Updated with tomas-devel