Closed #15
Merge branch 'master' of https://github.com/Magenic/OrgPortal