Merged BrendanP123's pull-request