Added modules by Alexey Melnichuk @moteus