22e4372 Merge branch 'pr-28' into 1.0.0-beta