Varioius Fixes

Signed-off-by: Mandeep Singh <mandeep@websterfolks.com>
Merge pull request #3 from meSingh/various-fixes

Varioius Fixes