workaround for #4
Merge branch 'master' into deploy