last changes
Merging issue-32 into develop and resolving conflicts