closes socd-io/Deployment#167
closes socd-io/Deployment#166