Merge pull request #2 from haywars/master

updates
Few very basic updates

updated the Db Class, and few others. very basic.
Merge remote-tracking branch 'CJ/master'