Update makefile

Executable is now created in root directory.
Fix bug
Merge remote-tracking branch 'upstream/master' into lb-refactor