Add some changes not saved in the last PR

Was my bad, Visual Studio didn't save the changes and I thought it did.

Signed-off-by: Steven Downer <grinch@outlook.com>
Merge pull request #9 from Grinch/master

Add some changes not saved in the last PR