Some minor updates
Merge pull request #1 from Mire/master

Some minor updates