Added the -b / --base_dir command line switch for providing the base dir
Merge remote-tracking branch 'origin/master'