Merge pull request #144 from morpheyesh/0.5

0.5
fix org, in view.
cc
Merge remote-tracking branch 'origin/0.5' into 0.5
Issues are fixed
Merge pull request #148 from rajthilakmca/0.5

Issues are fixed
Fix some issues
Merge pull request #149 from rajthilakmca/0.5

Fix some issues