Updated Stefan's suggestions on github