fix issues that using lists
Merge pull request #65 from vyorkin/bugfix/issues

fix issues that using lists