479+minor edits

Signed-off-by: stumbler <vitalijs.rodins@gmail.com>
Merge pull request #47 from stumbler/master

479+minor edits