add credits
add sogiuser5 contribution
fix fatal bug
fix merge with stephane