Refactored some code and fixed installation issues

Signed-off-by: Pankaj Singh <psjinx@gmail.com>
Merge branch 'release/0.0.3'
Merge tag '0.0.3' into develop

Fixed installation related issues and other bugs