if correction
Merge branch 'master' of https://github.com/scela/EclipseCon2014.git