bug #24046
bug #24144
bug #23867
bug #23704
Merge pull request #3 from perjeremy/master

Fixed bugs