[0.2.1] Resolves #10