Revert "Revert "Merge branch 'master' of https://github.com/OSU-Net/cyder""

This reverts commit 783f7c02bd2cd16a53e312b3f6826b2a27c9ba74.