Merge pull request #2 from mimi1vx/master

Small changes