Merge pull request #1 from mhender24/master

test
demo update
Merge pull request #2 from mhender24/master

test2
Merge pull request #3 from Mallics/master

demo update
resolving conflicts