Fix #22
Fix #22
Fix #23
Fix #25
Merge branch 'master' of https://github.com/lucasdavid/Gamedalf