add ec2 support
Merge branch 'ec2'