fixed a bug in merging of options
changed comment structure
changed comment structure
changed comment structure
changed comment structure
changed comment structure
changed comment structure
changed comment structure