Merge pull request #9 from niravpatel2008/developer

Developer
Tags and location related changes