docstrings
Merge branch 'feature/ec2-integration' into benchmark