Fixed Minor Issues
Merge pull request #1 from xkurnx/master

Fixed Minor Issues