Manually merged with thakyZ/myFirstGame