Update comments
Remove whitespaces
Merge pull request #10 from ymn/dev

Minor changes