Fixing hard-coded paths.
Fixing text encoding.
Touched by Xcode 4.6.3.
Merge pull request #1 from JanX2/master

Small fixes and improvements