for demo fixes
Merge pull request #19 from ggw215/Andra-Eiko

for demo fixes