Added latest changes to main.
Merge branch 'master' of https://github.com/vlad17/Palantir-Hackathon-2014-07