need to include getopt.h
Merge branch 'master' into importer