Merge pull request #10 from cpaika/master

Small changes
origin