Fixes #52.
Merge branch 'razor' of https://github.com/salmans/razor into razor