Added the -wig-only option
fixed two bugs
Merge branch 'wigonly'