add optional config.json path argument and also fix makefile
Merge remote-tracking branch 'origin/master'