use xtend for options
Merge pull request #85 from rvagg/xtend

use xtend for options