Resolves #27
Resolves #30