Merge of habib's branch