Version all in one
Merge branch 'master' of https://github.com/shaalin/awsHackathon2014