Resolves #27, upgrade to 1.5.0.preview.4

Resolves #27, #17 and #20