Solving compilation issues.
Merge branch 'master' of https://github.com/jaguirre/APRA2014
Bringing up-to-date.
Merge branch 'master' of https://github.com/jaguirre/APRA2014