minor improvements
Merge pull request #13 from nikitoz/master

minor improvements