Command line options, noref
Makefile, noref
Merge branch 'release/1.0'