Added additional default options and attributes
Merge remote-tracking branch 'upstream/master'
Merge pull request #67 from jerv13/master

Added additional default options and attributes