Refactored further
Merge pull request #233 from jcadek/master

Refactored further