Various fixes

Signed-off-by: Shwetank Dixit <emailshwetank@gmail.com>
Merge pull request #31 from shwetank/master

Various fixes