Issue #92 ,resolved conflicts with master