A few updates
Merge pull request #1 from chtitoon/updates

A few updates