#13 refactored Joola

Resolves #13