Merge pull request #370 from Sovietaced/in-ports-512

In port 512