#152,  #149 Hotfixes & Additions