Merge pull request #123 from chrqls/dev

[#122] Fixing crash and reparing the % limit correct