Merge branch 'hotfix/0.1.1'
Merge branch 'develop'
Code cleanup. Added few comments. todo and issues updated.