Added command line options

Conflicts:
	wmr100.c