more tiny changes
Merge pull request #4 from kendurkin/master

More tiny changes