RESOLVED ISSUES:
  http://clinker.isagroup.es/redmine/issues/78
  http://clinker.isagroup.es/redmine/issues/79