Exclude Windows temp files; minor improvements
Merge pull request #29 from xybu92/wip

Merge the minor improvements of wip to master