Merge pull request #107 from evillemez/master

cs fix