ignore test program
add prefix to /usr
Merge remote-tracking branch 'upstream/master'