Merge pull request #6 from mikegiberson/master

Merge pull request #19 from syhc/master
Delete Old Database Scripts
Fix collisions
Merge pull request #20 from syhc/master

Fix Issues