recommit because error in ec2
Merge branch 'master' of https://github.com/cecol/Taiwanofunguns