Merged in style argument.
Merges changes form Riad's code.