fixes
merging issue-69 into develop and resolving conflicts