made read parallel (untested), edited Makefile
Merge origin/master