Merge pull request #95 from deba/nitish

Pulling all changes from Nitish branch