Merge pull request #18 from szilardhuber/master

Changed column identification to id instead of autoincrement + Fixed some queries
Merge remote-tracking branch 'upstream/master'