Fixes #13 Fixes #14