Updating Makefile, bb- script, merging changes.
About to kill GIT.