windowsxp
direct from master
mac3
Merge remote-tracking branch 'upstream/master' into mac3

Conflicts:
	read.txt
Merge pull request #6 from kkkagalkar/mac3

windows xp
direct from master
Merge remote-tracking branch 'upstream/master'

Conflicts:
	read.txt