Merge pull request #38 from homeostasie/refactoring

Refactoring