Small changes
Merge pull request #2 from sagikazarmark/master

Small changes