Method D and I modifications

Ghost Userrequested to merge
issue108 into develop

solution for issue #108, modifications for issue #105 and #88

Edited by Mohcine Chraibi

Merge request reports