merging issue-46 into develop and resolving conflicts