Added a new variable for handling org buffers
Merge branch 'takaxp/master'