Resolves #188. Thanks Sasha!