alexw91 Merge pull request #814 from fatrat1117/minor-improvements …