new branch, working on build scripts
fixed makefile bug
Merge remote-tracking branch 'origin/configure_devel'