Update for remake 0.9
Merge pull request #225 from rocky/remake-0.9

Update for remake 0.9