Merge pull request #18 from ggw215/Andra-Eiko

Andra eiko
for demo fixes