I'm fixing stuff on the master and I know it II (updates #303)