Merge pull request #1 from altsai/master

fix issues
add unlimited
Merge pull request #2 from altsai/unlimited

add unlimited