commiting after merging with freynaud/master