Merge RandomGenerator and Send site

fixes #13