Minor improvements
Merge pull request #5 from sergeyklay/next

Minor improvements