#48,#49

I don't know. I can't push it automatically.
Fixes #48 and #49