Merge pull request #42 from dentrifonov/fix-organization

Fix organization
merge with master