[0.3.1] Fixes #6