complete, works
updated makefile
Merge pc10