Fixes #1
Merge branch 'master' into FsRewrite