Update from EmilHernvall:master