methods changed to suit new DB structure
Remove temp files
Merge pull request #92 from SupunS/master

methods changed to suit new DB structure