This will be fixed after we merge #22 and I rebase this.