Added option "priority".
Fix indenting
Merge remote-tracking branch 'bewinter/master'