Merge remote-tracking branch 'almende/master'
After deprecating options as parameter, the original if (options) block should not replaced with this.option, which is always true and causes issues in some cases.
Merge pull request #321 from stefanofornari/master

fix in draw()