Merge pull request #10 from KristofferAo/master

as
arrrr
Merge branch 'master' of https://github.com/CaF2/demo