polish files; tested on Linux
Merge pull request #1 from hethi/wip

polish files; tested on Linux