Updated to work with Elm 0.13