Created by: scarrazza
Implements suggestions and closes #600 (closed) . @juanrojochacon please let us know.