Merge pull request #58 from arturobernalg/featture/JCS-217

JCS-217 Minor improvements: