Formalize Makefile and modify staging.cpp
Merge branch 'master' into HPCA
Modify enviroments