Refactored some code and fixed installation issues

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