Version 2.2.8 - bug fixes