Merge pull request #92 from SupunS/master

methods changed to suit new DB structure
Merge remote-tracking branch 'upstream/master'