katlogic Merge pull request #7 from u3shit/api-fixes