demo page done
demo page reworked
Merging issue-10 into develop and resolved conflicts