CLOSE #30 + CI3 update + little improvements and fixes