Corrected some bugs
Merge pull request #8 from Eliocity/master

Case problem in linux