consistency in spacing
Merging issue-92 into develop and resolved conflicts