Added auto_mark support
Merge remote-tracking branch 'origin/master'
Working auto mark