Initial work done in July 2014 dojo by Kiran and Omid
Merge pull request #2 from kiran-singh/master

Initial work done in July 2014 dojo by Kiran and Omid