Fixes #26. About time..