minor rework
resolved conflicts and merging issue-98 develop