2014 07 08 - Bug/v4

Making a merge on 2014 07 08 to update the current development state