Fixed @jesperbylund comments in #27