Merge pull request #7 from purplecabbage/CB2592

Cb2592