Fixes #40

It's supposed to be only the last 2 commits, but while #72 is not closed, github shows all the commits here