Improving design
Improving design
Merge pull request #17 from javfindly/develop

Final version