Merge pull request #1 from BjarneFred/master

first change
db and layout change
Merge pull request #1 from thisislorne/master

update from original