Fixing regression with extending options; Adding 'orient' attribute; Fixes #2