Refactoring More
Merge pull request #235 from jcadek/master

Refactoring More