Fixes GH #110
Refactorings