Small changes
Merge pull request #92 from WannabeSid/master

Small changes