demo page
Merging issue-7 into develop and resolving conflicts