Merge pull request #86 from anujag/master

this commit, includes several unlisted features.
Latest code updated 07-03-13