Merge pull request #19 from santoshdeshpande/master

Changes done this week.
Built for GAE