Merging issue-32 into develop and resolved conflicts