#13 refactored Joola
Merge pull request #14 from joola/feature/#13

#13 refactored Joola