Merge pull request #16 from janm399/master

DEmo