Fixes #11, Fixes #13