fixed "works on my machine" problems
Merge pull request #1 from krockode/master

fixed "works on my machine" problems