brendanzab Merge pull request #30 from arturoc/refactoring …