Design Improvement
Merge pull request #1 from josemcm90/0.2

Design Improvement