Implementing handling organization issues
Merge pull request #69 from mrkrstphr/org-issues

Implementing handling organization issues