Fixes #25, Fixes #24