orgfix
organization display fix
domain fix
Merge pull request #187 from morpheyesh/0.5

0.5