Initial commit
Merge branch 'master' of github.com:tijomathew/dem
merged with latest changes