Changes to solve bug#1347

Signed-off-by: Arpit Goyal <agmps17@gmail.com>
Merge pull request #85 from agmps17/bootstrap

Changes to solve bug#1347