Merge pull request #16 from morpheyesh/0.5

0.5
Merge remote-tracking branch 'origin/0.5' into 0.5

yes
Org and DOmains done