spacing issues fixed
resolved conflicts and merging issue-129 into develop