bugs
Merge pull request #25 from kalmecak/candies/kalmecak/bugs

bugs
Merge branch 'dev' into candies/deploy
dep