@Cadair's small changes
Merge pull request #101 from Cadair/master

@Cadair's small changes