added greyscale option
fixed a problem with contrast
minor fixes
fixing merge conflicts