Closes 53, also changed english version