Changes for making possible to use EC2.
Merge pull request #89 from n3phele/EC2_Fix

Changes for making possible to use EC2.