Merge pull request #20 from ProjectAlly/master

SQL changes
minor changes..
Merge pull request #35 from sonal71/master

minor updates