Merge Nicolas Release 0.9