Issue #32

:8ball: